remap_plugin_query