Adding a counter for the filter values.
Update SQL
Merge branch 'master' into dev

Conflicts:
	src/system/modules/metamodelsattribute_tags/MetaModelAttributeTags.php