Added COaP 13 support for query