Updated queries in FKController