Minor merge bugfixes
Added support for list of locations
Better locations serialization