Fixed 2 silly bugs regarding tags