$x parsing for query fields fixed.