Issue #1890194 by temaruk: Fixed Flag links are not updated if the machine name of a flag contains underscore.