Started fixing search controller