fix query annotations