Merge "Revert "Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter...