Support checkboxes for query method values
Merge branch 'checkbox-state-for-query-methods' into development