Refactor tags partial to not use instance variables