Tag consistency audit

@commuterjoy @aintgoin2goa @matthew-andrews @adgad 
Can these design changes be merged please.