Move custom matcher to "utils" package.
Correct manual parsing of alternate result types in queries to leverage more standard Jackson code and as a result deal correctly with empty arrays.