Move search to other controller