more tags model fixes