Changed flag entity ID from flag_flag to just plain 'ol flag.