Tweak order of container adding to update location_fact properly
Inventory and message areas