Simplifying by using standard query parser