restored some search functionality
merge josh and brian controller changes