Major fixes on search and other controllers