Updated to add search field control