Added filters for custom query