Major Revamp to QueryParser

Revamped QueryParser to use regex. tested with the existing queries and
sources.