Search Controller modified