adding flexible query parser
adding flexible query parser