Enhanced parseQuery method
Enhanced Observable to remove duplicated event handlers on fire stage
Removed some TODO
Removed TODO