Pulled the RPC query out of the data schema loop, so that