Merge pull request #4938 from kumpera/optimize_ref_queries