Simplify data loading by passing full query through.