Updated search controller