Code review on tags related code