Add decoded Query accessors; QueryParser#parseAs->parse; null checking
Visually cleaner test