Zapped "search for locations" bit
Removed uniqueness on one of the ID fields