fixed issues with location and firstname