Fixes issues with search controller