Small refactors and made tags and tagrows comparable