Fixing issues with parser. Added few other keywords. Cleaning up parser data after each query parsing