added support for multiple locations per user