fixed issue with locations being saved into all states