Repeat locations not added to database
fix location passing bug
merge conflict