Adding query_filter option for model configs (Closes #213, closes #237)