NXP-14374: clean query api
NXP-14374: reformat
NXP-14374: add a NxQueryBuilder api, enabling to pass new params easily