r2184 - enhance saveEntityTags() and get rid of 6 wrapping functions