Refactored the controller find

Refactored the controller find method into a shared custom finder