Modified Search Controller