Add data model filtering ability
Merge remote-tracking branch 'origin/TagFiltering' into 3.6_Tags