LP#1310751: Reorder query-building wrapper for QueryParser