CDB-2057 added remaining logic of filter vis. by tags, removed dead code and renaming