Added the ability to override the query filter field values.