Added check for tags on model change