Fixed a bug from data not having faction info.
Merge branch 'global'