Fixed APPS-7. Display value fields correctly in detail view.
Fixed merge conflicts