NXP-15170: Align Swagger apis on query rest api updates