add option to parse query