Update tags so they work with non Rock entities