Update uri mapping, use match query

Second version of #1252

As an added extra, our system now can handle match queries for ES and the old and bulky ClauseParser class got removed.

Fix for #1243