Update interceptor and delete query annotation