merge Xiph plugin with JSON query back in, enable per default again