added sort to queries, resolvedRecord to proxies