diff --git a/RichClientDemoTest/src/com/redheap/selenium/LocatorTest.java b/RichClientDemoTest/src/com/redheap/selenium/LocatorTest.java
index 5764546..0af2ec7 100644
--- a/RichClientDemoTest/src/com/redheap/selenium/LocatorTest.java
+++ b/RichClientDemoTest/src/com/redheap/selenium/LocatorTest.java
@@ -1,14 +1,11 @@
 package com.redheap.selenium;
 
-import com.redheap.selenium.component.AdfDynamicDeclarativeComponent;
 import com.redheap.selenium.component.AdfInputText;
-import com.redheap.selenium.component.AdfOutputText;
 import com.redheap.selenium.component.AdfTable;
 import com.redheap.selenium.junit.PageProvider;
 import com.redheap.selenium.junit.SavePageSourceOnFailure;
 import com.redheap.selenium.junit.ScreenshotOnFailure;
 import com.redheap.selenium.junit.WebDriverResource;
-import com.redheap.selenium.pages.DeclarativeComponentPage;
 import com.redheap.selenium.pages.EditableTablePage;
 
 import java.io.File;
@@ -30,8 +27,8 @@ public class LocatorTest {
     public static WebDriverResource driver = new WebDriverResource();
     @Rule
     public PageProvider<EditableTablePage> tablePage = new PageProvider(EditableTablePage.class, TABLE_PAGE, driver.getDriver());
-    @Rule
-    public PageProvider<DeclarativeComponentPage> declCompPage = new PageProvider(DeclarativeComponentPage.class, DECL_COMP_PAGE, driver.getDriver());
+//    @Rule
+//    public PageProvider<DeclarativeComponentPage> declCompPage = new PageProvider(DeclarativeComponentPage.class, DECL_COMP_PAGE, driver.getDriver());
     @Rule
     public TestWatcher screenshotOnFailure = new ScreenshotOnFailure(driver.getDriver(), new File("errors"));
     @Rule
@@ -63,15 +60,15 @@ public void testRelativeLocatorFromNonNamingContainer() {
         assertEquals("dmoTpl:table1:0:it3", target.getClientId());
     }
 
-    @Test
-    public void testRelativeLocatorFromNamingContainer() {
-        EditableTablePage page = tablePage.goHome();
-        AdfTable table = page.findTable();
-        AdfDynamicDeclarativeComponent namingContainer = table.findAdfComponentByLocator(":dmoTpl:gTools:glryFind");
-        AdfInputText target = namingContainer.findAdfComponentByLocator("findIt");
-        assertEquals("dmoTpl:gTools:glryFind:findIt", target.getAbsoluteLocator());
-        assertEquals("dmoTpl:gTools:glryFind:findIt", target.getClientId());
-    }
+//    @Test
+//    public void testRelativeLocatorFromNamingContainer() {
+//        EditableTablePage page = tablePage.goHome();
+//        AdfTable table = page.findTable();
+//        AdfDynamicDeclarativeComponent namingContainer = table.findAdfComponentByLocator(":dmoTpl:gTools:glryFind");
+//        AdfInputText target = namingContainer.findAdfComponentByLocator("findIt");
+//        assertEquals("dmoTpl:gTools:glryFind:findIt", target.getAbsoluteLocator());
+//        assertEquals("dmoTpl:gTools:glryFind:findIt", target.getClientId());
+//    }
 
     @Test
     public void testRelativeDifferentIndexLocator() {
@@ -99,25 +96,25 @@ public void testNonExistingChild() {
         assertNull(table.findAdfComponent("foo"));
     }
 
-    @Test
-    public void testDeclarativeComponentLocator() {
-        DeclarativeComponentPage page = declCompPage.goHome();
-        AdfDynamicDeclarativeComponent declComp = page.findDeclarativeComponent();
-        AdfOutputText target = declComp.findAdfComponentByLocator("dcot1");
-        assertEquals("dmoTpl:lwdc:dcot1", target.getAbsoluteLocator());
-        assertEquals("dmoTpl:lwdc:dcot1", target.getClientId());
-        // af:ierator does not exist at client, so simple iter:0:item and not iter[0]:item
-        AdfInputText it0 = declComp.findAdfComponentByLocator("dci1:0:itemsText");
-        assertEquals("dmoTpl:lwdc:dci1:0:itemsText", it0.getAbsoluteLocator());
-        assertEquals("dmoTpl:lwdc:dci1:0:itemsText", it0.getClientId());
-        AdfInputText it2 = declComp.findAdfComponentByLocator("dci1:2:itemsText");
-        assertEquals("dmoTpl:lwdc:dci1:2:itemsText", it2.getAbsoluteLocator());
-        assertEquals("dmoTpl:lwdc:dci1:2:itemsText", it2.getClientId());
-        // facet content
-        AdfInputText fit = declComp.findAdfComponentByLocator("facetInputText");
-        assertEquals("dmoTpl:lwdc:facetInputText", fit.getAbsoluteLocator());
-        assertEquals("dmoTpl:lwdc:facetInputText", fit.getClientId());
-    }
+//    @Test
+//    public void testDeclarativeComponentLocator() {
+//        DeclarativeComponentPage page = declCompPage.goHome();
+//        AdfDynamicDeclarativeComponent declComp = page.findDeclarativeComponent();
+//        AdfOutputText target = declComp.findAdfComponentByLocator("dcot1");
+//        assertEquals("dmoTpl:lwdc:dcot1", target.getAbsoluteLocator());
+//        assertEquals("dmoTpl:lwdc:dcot1", target.getClientId());
+//        // af:ierator does not exist at client, so simple iter:0:item and not iter[0]:item
+//        AdfInputText it0 = declComp.findAdfComponentByLocator("dci1:0:itemsText");
+//        assertEquals("dmoTpl:lwdc:dci1:0:itemsText", it0.getAbsoluteLocator());
+//        assertEquals("dmoTpl:lwdc:dci1:0:itemsText", it0.getClientId());
+//        AdfInputText it2 = declComp.findAdfComponentByLocator("dci1:2:itemsText");
+//        assertEquals("dmoTpl:lwdc:dci1:2:itemsText", it2.getAbsoluteLocator());
+//        assertEquals("dmoTpl:lwdc:dci1:2:itemsText", it2.getClientId());
+//        // facet content
+//        AdfInputText fit = declComp.findAdfComponentByLocator("facetInputText");
+//        assertEquals("dmoTpl:lwdc:facetInputText", fit.getAbsoluteLocator());
+//        assertEquals("dmoTpl:lwdc:facetInputText", fit.getClientId());
+//    }
 
     public static void main(String[] args) {
         String[] args2 = { LocatorTest.class.getName() };
diff --git a/RichClientDemoTest/src/com/redheap/selenium/components/MenuTest.java b/RichClientDemoTest/src/com/redheap/selenium/components/MenuTest.java
new file mode 100644
index 0000000..abb60d5
--- /dev/null
+++ b/RichClientDemoTest/src/com/redheap/selenium/components/MenuTest.java
@@ -0,0 +1,59 @@
+package com.redheap.selenium.components;
+
+import com.redheap.selenium.component.AdfCommandMenuItem;
+import com.redheap.selenium.component.AdfMenu;
+import com.redheap.selenium.junit.PageProvider;
+import com.redheap.selenium.junit.SavePageSourceOnFailure;
+import com.redheap.selenium.junit.ScreenshotOnFailure;
+import com.redheap.selenium.junit.WebDriverResource;
+
+import com.redheap.selenium.pages.MenuDemoPage;
+
+import java.io.File;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.TestWatcher;
+
+public class MenuTest {
+
+    @ClassRule
+    public static WebDriverResource driver = new WebDriverResource();
+    @Rule
+    public PageProvider<MenuDemoPage> pages = new PageProvider(MenuDemoPage.class, HOME_PAGE, driver.getDriver());
+    @Rule
+    public TestWatcher screenshotOnFailure = new ScreenshotOnFailure(driver.getDriver(), new File("errors"));
+    @Rule
+    public TestWatcher saveSourceOnFailure = new SavePageSourceOnFailure(driver.getDriver(), new File("errors"));
+
+    private static final String HOME_PAGE = "http://localhost:7101/adf-richclient-demo/faces/components/menu.jspx";
+
+    @Test
+    public void testDisabledMenu() {
+        AdfMenu menu = pages.goHome().findDisabledMenu();
+        assertTrue(menu.isDisabled());
+    }
+
+    @Test
+    public void testFileMenu() {
+        MenuDemoPage page = pages.goHome();
+        AdfMenu menu = page.findFileMenu();
+        assertTrue(!menu.isDisabled());
+        assertEquals("File", menu.getElement().getText());
+        menu.click();
+        AdfCommandMenuItem closeItem = page.findCloseItem();
+        assertEquals("Close Ctrl+W", closeItem.getElement().getText());
+    }
+
+    @Test
+    public void testSubMenuNew() {
+        MenuDemoPage page = pages.goHome();
+        AdfMenu menu = page.findFileMenu();
+        menu.click();
+        AdfMenu newMenu = page.findNewSubMenu();
+        assertEquals("New", newMenu.getElement().getText());
+    }
+}
diff --git a/RichClientDemoTest/src/com/redheap/selenium/components/SelectManyChoiceTest.java b/RichClientDemoTest/src/com/redheap/selenium/components/SelectManyChoiceTest.java
index d60ddf8..7aaa540 100644
--- a/RichClientDemoTest/src/com/redheap/selenium/components/SelectManyChoiceTest.java
+++ b/RichClientDemoTest/src/com/redheap/selenium/components/SelectManyChoiceTest.java
@@ -9,7 +9,7 @@
 
 import java.io.File;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.Assert.*;
 import org.junit.ClassRule;
@@ -33,26 +33,54 @@ public class SelectManyChoiceTest {
         "http://localhost:7101/adf-richclient-demo/faces/components/selectManyChoice.jspx";
 
     @Test
-    public void testItemLabels() {
+    public void testItems() {
         AdfSelectManyChoice choice = pages.goHome().findDrinksSelectManyChoice();
         assertEquals("coffee", choice.getItemLabel(0));
+        assertEquals("0", choice.getItemValue(0));
+        assertEquals(0, choice.getItemIndexByLabel("coffee"));
         assertEquals("tea", choice.getItemLabel(1));
-        // item 2 is rendered=false
-        assertEquals("fizz", choice.getItemLabel(3));
-        // item 4 is rendered=false
-        assertEquals("beer", choice.getItemLabel(5));
-        assertEquals("lemonade", choice.getItemLabel(6));
+        assertEquals("1", choice.getItemValue(1));
+        assertEquals(1, choice.getItemIndexByLabel("tea"));
+        // milk (value "2") is rendered=false
+        assertEquals("fizz", choice.getItemLabel(2));
+        assertEquals("3", choice.getItemValue(2));
+        assertEquals(2, choice.getItemIndexByLabel("fizz"));
+        // item "4" is rendered=false
+        assertEquals("beer", choice.getItemLabel(3));
+        assertEquals("5", choice.getItemValue(3));
+        assertEquals(3, choice.getItemIndexByLabel("beer"));
+        assertEquals("lemonade", choice.getItemLabel(4));
+        assertEquals("6", choice.getItemValue(4));
+        assertEquals(4, choice.getItemIndexByLabel("lemonade"));
     }
 
     @Test
     public void testSetValue() {
         AdfSelectManyChoice choice = pages.goHome().findDrinksSelectManyChoice();
-        choice.clickItemsByIndices(new int[] { 1, 3 });
-        choice.click();
-        ArrayList clickedItems = (ArrayList) choice.getValue();
-        assertEquals(2, clickedItems.size());
-        assertEquals("1", clickedItems.get(0));
-        assertEquals("3", clickedItems.get(1));
+        choice.clickItemsByIndices(1, 3, 4); // idx=3 is disabled so should not work
+        assertEquals( "tea; lemonade", choice.getContent());
+        // selected values
+        List<Object> selectedValues = choice.getValue();
+        assertEquals(2, selectedValues.size());
+        assertEquals("1", selectedValues.get(0));
+        assertEquals("6", selectedValues.get(1));
+        // selected indices
+        long[] selectedIndices = choice.getValueIndices();
+        assertEquals(2, selectedIndices.length);
+        assertEquals(1, selectedIndices[0]);
+        assertEquals(4, selectedIndices[1]);
+        List<String> selectedLabels = choice.getValueLabels();
+        assertEquals(2, selectedLabels.size());
+        assertEquals("tea", selectedLabels.get(0));
+        assertEquals("lemonade", selectedLabels.get(1));
+        choice.clickItemsByLabels("fizz", "item6");
+        assertEquals("tea; fizz; lemonade; item6", choice.getContent());
+        selectedLabels = choice.getValueLabels();
+        assertEquals(4, selectedLabels.size());
+        assertEquals("tea", selectedLabels.get(0));
+        assertEquals("fizz", selectedLabels.get(1));
+        assertEquals("lemonade", selectedLabels.get(2));
+        assertEquals("item6", selectedLabels.get(3));
     }
 
     public static void main(String[] args) {
diff --git a/RichClientDemoTest/src/com/redheap/selenium/pages/MenuDemoPage.java b/RichClientDemoTest/src/com/redheap/selenium/pages/MenuDemoPage.java
new file mode 100644
index 0000000..56d6acd
--- /dev/null
+++ b/RichClientDemoTest/src/com/redheap/selenium/pages/MenuDemoPage.java
@@ -0,0 +1,40 @@
+package com.redheap.selenium.pages;
+
+import com.redheap.selenium.component.AdfCommandMenuItem;
+import com.redheap.selenium.component.AdfMenu;
+import com.redheap.selenium.page.Page;
+
+import org.openqa.selenium.WebDriver;
+
+public class MenuDemoPage extends Page {
+    
+    private final String fileMenu = "dmoTpl:menu1";
+    private final String newSubmenu = "dmoTpl:menu2";
+    private final String disabledMenu = "dmoTpl:menu8";
+    private final String closeMenuItem = "dmoTpl:cmi9";
+    
+    public MenuDemoPage(WebDriver webDriver) {
+        super(webDriver);
+    }
+    
+    @Override
+    protected String getExpectedTitle() {
+        return "menu Demo";
+    }
+    
+    public AdfMenu findFileMenu() {
+        return findAdfComponent(fileMenu);
+    } 
+   
+    public AdfCommandMenuItem findCloseItem(){
+        return findAdfComponent(closeMenuItem);
+    }
+   
+    public AdfMenu findNewSubMenu() {
+        return findAdfComponent(newSubmenu);
+    } 
+  
+    public AdfMenu findDisabledMenu() {
+        return findAdfComponent(disabledMenu);
+    }  
+}
diff --git a/SeleniumTools/src/com/redheap/selenium/component/AdfMenu.java b/SeleniumTools/src/com/redheap/selenium/component/AdfMenu.java
new file mode 100644
index 0000000..abd6db2
--- /dev/null
+++ b/SeleniumTools/src/com/redheap/selenium/component/AdfMenu.java
@@ -0,0 +1,11 @@
+package com.redheap.selenium.component;
+ 
+import org.openqa.selenium.WebDriver;
+
+public class AdfMenu extends AdfComponent {
+    
+    public AdfMenu(WebDriver webDriver, String clientId) {
+        super(webDriver, clientId);
+    }
+
+}
diff --git a/SeleniumTools/src/com/redheap/selenium/component/AdfSelectManyChoice.java b/SeleniumTools/src/com/redheap/selenium/component/AdfSelectManyChoice.java
index 0bf8b3a..2603a5c 100644
--- a/SeleniumTools/src/com/redheap/selenium/component/AdfSelectManyChoice.java
+++ b/SeleniumTools/src/com/redheap/selenium/component/AdfSelectManyChoice.java
@@ -2,68 +2,101 @@
 
 import com.redheap.selenium.component.uix.UixValue;
 
-import org.openqa.selenium.Keys;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 public class AdfSelectManyChoice extends UixValue {
 
     // see http://jdevadf.oracle.com/adf-richclient-demo/docs/js-subids.html
-    private static final String SUBID_content = "content"; // <select> element
-    private static final String SUBID_dropdown = "dropdown"; // only when mode=compact <a> element
-    private static final String SUBID_item = "item"; // item[99] <option> element (or <li> when mode=compact)
+    private static final String SUBID_content = "content"; // <input type='text'> element
+    private static final String SUBID_drop = "drop"; // <a> element to expand
+    private static final String SUBID_item = "item"; // item[99] <input type='checkbox'> element
     private static final String SUBID_label = "label"; // <label> element
 
-    private static final String JS_VALUE_BY_LABEL =
+    private static final String JS_INDEX_BY_LABEL =
+        JS_FIND_COMPONENT +
+        "var items=comp.getSelectItems(); for (var i=0;i<items.length;i++){if (items[i].getLabel()===arguments[1]) return i}; return null;";
+    private static final String JS_INDEX_BY_VALUE =
+        JS_FIND_COMPONENT +
+        "var items=comp.getSelectItems(); for (var i=0;i<items.length;i++){if (items[i].getValue()===arguments[1]) return i}; return null;";
+    private static final String JS_LABEL_BY_INDEX =
         JS_FIND_COMPONENT +
-        "var items=comp.getSelectItems(); for (var i=0;i<items.length;i++){if (items[i].getLabel()===arguments[1]) return items[i].getValue()}; return null;";
-    private static final String JS_LABEL_BY_VALUE =
+        "return comp.getSelectItems()[arguments[1]] && comp.getSelectItems()[arguments[1]].getLabel();";
+    private static final String JS_VALUE_BY_INDEX =
         JS_FIND_COMPONENT +
-        "var items=comp.getSelectItems(); for (var i=0;i<items.length;i++){if (items[i].getValue()===arguments[1]) return items[i].getLabel()}; return null;";
+        "return comp.getSelectItems()[arguments[1]] && comp.getSelectItems()[arguments[1]].getValue();";
 
-    public AdfSelectManyChoice(WebDriver webDriver, String clientId) {
-        super(webDriver, clientId);
+    public AdfSelectManyChoice(WebDriver driver, String clientId) {
+        super(driver, clientId);
     }
 
     /**
-     * Click all items in the list on the indices
+     * Click items in the list on the indices. This deselects an item if it was selected or selects it if it was not.
      * @param indices
+     * @see #clickItemsByLabels
      */
-    public void clickItemsByIndices(int[] indices) {
-        // expand list
-        WebElement dropdown = findDropdown();
-        if (dropdown != null) {
-            dropdown.click(); // mode=compact
-        } else {
-            click(); // click element itself when not in compact mode
-        }
+    public void clickItemsByIndices(long... indices) {
+        findDrop().click(); // expand list
         // click items within list
         for (int i = 0; i < indices.length; i++) {
             findItem(indices[i]).click();
         }
-        findContentNode().sendKeys(Keys.TAB);
+        findDrop().click(); // collapse list
         waitForPpr();
     }
 
     /**
-     * Click all items in the list which equal the labels
-     * @param label
+     * Click all items in the list which equal the labels. This deselects an item if it was selected or selects it if
+     * it was not
+     * @param labels
+     * @see #clickItemsByIndices
      */
-    public void clickItemsByLabels(String[] label) {
-        int[] indices = new int[label.length];
-        for (int i = 0; i < label.length; i++) {
-            indices[i] = getValueByLabel(label[i]);
+    public void clickItemsByLabels(String... labels) {
+        long[] indices = new long[labels.length];
+        for (int i = 0, n = labels.length; i < n; i++) {
+            indices[i] = getItemIndexByLabel(labels[i]);
         }
         clickItemsByIndices(indices);
     }
 
     /**
-     * Get the label of an item in the list
-     * @param index
-     * @return string label
+     * Returns the value of the selected items in this selectManyChoice. Typically these are just string values
+     * with the indices unless valuePassThrou is enabled which causes the server-side value to be used at the client
+     * side.
+     * @return values of items which could be empty but never {@code null}
+     * @see #getValueLabels
+     */
+    @Override
+    public List<Object> getValue() {
+        List<Object> val = (List<Object>) super.getValue();
+        return val == null ? Collections.emptyList() : new ArrayList<Object>(val);
+    }
+
+    /**
+     * Returns the labels of the selected items in this selectManyChoice.
+     * @return collection of item labels
+     * @see #getValue
      */
-    public String getItemLabel(int index) {
-        return (String) executeScript(JS_LABEL_BY_VALUE, getClientId(), Integer.toString(index));
+    public List<String> getValueLabels() {
+        List<Object> vals = getValue();
+        List<String> retval = new ArrayList<String>(vals.size());
+        for (Object val : vals) {
+            retval.add(getItemLabel(getItemIndexByValue(val)));
+        }
+        return retval;
+    }
+
+    public long[] getValueIndices() {
+        List<Object> vals = getValue();
+        long[] retval = new long[vals.size()];
+        for (int i = 0, n = vals.size(); i < n; i++) {
+            retval[i] = getItemIndexByValue(vals.get(i));
+        }
+        return retval;
     }
 
     /**
@@ -71,18 +104,24 @@ public String getItemLabel(int index) {
      * @param label
      * @return int value
      */
-    public int getValueByLabel(String label) {
-        String value = (String) executeScript(JS_VALUE_BY_LABEL, getClientId(), label);
-        return value == null ? -1 : Integer.valueOf(value);
+    public long getItemIndexByLabel(String label) {
+        Long index = (Long) executeScript(JS_INDEX_BY_LABEL, getClientId(), label);
+        return index == null ? -1 : Long.valueOf(index);
     }
 
-    /**
-     * Get the valuelabel
-     * @return string value
-     */
-    public String getValueLabel() {
-        String value = (String) getValue();
-        return value == null || value.isEmpty() ? null : getItemLabel(Integer.valueOf(value));
+    public long getItemIndexByValue(Object value) {
+        Long index = (Long) executeScript(JS_INDEX_BY_VALUE, getClientId(), value);
+        return index == null ? -1 : Long.valueOf(index);
+    }
+
+    public String getItemLabel(long index) {
+        String label = (String) executeScript(JS_LABEL_BY_INDEX, getClientId(), index);
+        return label;
+    }
+
+    public Object getItemValue(long index) {
+        Object value = executeScript(JS_VALUE_BY_INDEX, getClientId(), index);
+        return value;
     }
 
     /**
@@ -94,21 +133,21 @@ protected WebElement findContent() {
     }
 
     /**
-     * Method to get the dropdown list
+     * Method to get the &lt;a&gt; element to expand or collapse the dropdown list
      * @return the dropdown WebElement
      */
-    protected WebElement findDropdown() {
-        return findSubIdElement(SUBID_dropdown);
+    protected WebElement findDrop() {
+        return findSubIdElement(SUBID_drop);
     }
 
     /**
-     * Get an item in the list by index
+     * Get an item in the list by index.
      * @param index
-     * @return The item WebElement
+     * @return The &lt;input type=checkbox&gt; item WebElement
      */
-    protected WebElement findItem(int index) {
-        // warning: does not work for mode=compact when not yet expanded
-        return findSubIdElement(SUBID_item + "[" + index + "]");
+    protected WebElement findItem(long index) {
+        Object value = getItemValue(index);
+        return findSubIdElement(SUBID_item + "[" + value + "]");
     }
 
     /**
diff --git a/SeleniumTools/src/com/redheap/selenium/component/AutoSuggestBehavior.java b/SeleniumTools/src/com/redheap/selenium/component/AutoSuggestBehavior.java
index 94cce03..83f4bfd 100644
--- a/SeleniumTools/src/com/redheap/selenium/component/AutoSuggestBehavior.java
+++ b/SeleniumTools/src/com/redheap/selenium/component/AutoSuggestBehavior.java
@@ -78,10 +78,16 @@ protected WebElement findMoreLinkElement() {
     public void typeAndWait(String value) {
         component.clear();
         component.sendKeys(Keys.BACK_SPACE, value);
+        final AdfComponent comp = component;
         new WebDriverWait(component.getDriver(), 10, 100).until(new Predicate<WebDriver>() {
             @Override
             public boolean apply(WebDriver webDriver) {
-                return isPopupVisible();
+                if (isPopupVisible()) {
+                    comp.waitForPpr();
+                    return true;
+                } else {
+                    return false;
+                }
             }
         });
     }
diff --git a/SeleniumTools/src/com/redheap/selenium/component/uix/UixValue.java b/SeleniumTools/src/com/redheap/selenium/component/uix/UixValue.java
index 394adb2..02cff8d 100644
--- a/SeleniumTools/src/com/redheap/selenium/component/uix/UixValue.java
+++ b/SeleniumTools/src/com/redheap/selenium/component/uix/UixValue.java
@@ -3,18 +3,41 @@
 import com.redheap.selenium.component.AdfComponent;
 
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 
 public abstract class UixValue extends AdfComponent {
 
-    private static final String JS_GET_VALID = JS_FIND_COMPONENT + "return comp.getValue();";
+    private static final String JS_GET_VALUE = JS_FIND_COMPONENT + "return comp.getValue();";
 
     public UixValue(WebDriver webDriver, String clientid) {
         super(webDriver, clientid);
     }
 
+    /**
+     * Gets the current value of the component after any validation and client side converters.
+     * @return current value of the component.
+     */
     public Object getValue() {
         // returns null when component is not valid
-        return executeScript(JS_GET_VALID, getClientId());
+        return executeScript(JS_GET_VALUE, getClientId());
+    }
+
+    /**
+     * Returns the displayed text value of the content element of this component. This is the string that is
+     * visible to the user.
+     * @return null if component does not have a content element, or the {@code value} attribute if the content
+     * element is an input component or the text content of any other type of content element.
+     */
+    public String getContent() {
+        // try to find subid "content"
+        WebElement content = findSubIdElement("content");
+        if (content == null) {
+            return null;
+        } else if (content.getTagName().equalsIgnoreCase("input")) {
+            return content.getAttribute("value");
+        } else {
+            return content.getText();
+        }
     }
 
 }