[Code Style] various changes
Merge pull request #4545 from marcodings/mod-tags_similar-marco

[Code Style] mod-tags_similar various changes