Add support for Merchandiser Query Tool (#1)