Melanie/Ashwin | #3080 |fixing location field bug.