Modified search controller