Moved search code to master controller, simplified init control