diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
index 03b7815..ebb3eff 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
@@ -34,6 +34,7 @@
 import javax.faces.event.PhaseId;
 
 import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.commons.OptionEntry;
 import org.apache.empire.commons.Options;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.Column;
@@ -700,9 +701,9 @@
         Options options = vi.getOptions();
         if (options != null && !options.isEmpty() && !hasFormatOption(vi, "nolookup"))
         {   // Check for Options
-            String text = options.get(value);
-            if (StringUtils.isNotEmpty(text))
-                return vi.getText(text);
+            OptionEntry entry = options.getEntry(value);
+            if (entry!=null)
+                return vi.getText(entry.getText());
             // Error
             if (value!=null)
                 InputControl.log.error("The element '" + String.valueOf(value) + "' is not part of the supplied option list.");