fixed dependency issue with new ui library. adjusted wording for search control.
merge