Super Search Controller Refactor/Cleanup/Delegation