Improve Search Controller