Decouple tags a bit from controller