Move search into Player controller