Improved performance of Controller queries. Also added checks for missing controllers.