Re: [PATCH 1/2] query: move declarations of filter related functions