Bug fix: Variables not being parse
Bug fixes to Flag event