search controller + data model changes