add custom query support