Fixed loading problems with tags