[Code Style] fix style in com_tags. Fixes #4567

[Code Style] fix style in com_tags fix @todo

[Code Style] second round of fixes in com_tags