Fixed the query builder regex to better account for overlapping property names