Name field fixes
New Location field