Fixed https://bugzilla.redhat.com/show_bug.cgi?id=923517
Fixed some buggy expansions
Working on bulk overwrite
Working on bulk overwrite
Working on bulk overwrite
Working on bulk overwrite
Working on bulk overwrite
Production build 201303220826