NXP-15087 integrate basic Query Builder