Moving query parser to lucure package