Switch to using references instead of parsing the file to process queries
References are now quite accurate, at the cost of some database-layer slowdown