#386 Split up queries for data compare to improve speed