more changes for tags