Put back workaround for adapter (to avoid query modification)