Moved search to search controller