Handle dialog updates to to tag properly (bug #5166)