Make remote FK queries fast by adding FK fields to non-deferred field list