Final additional fix for overlapping markers

Previous fix meant that only the first overlapping marker was moved. All
the rest still continued to overlap over the first location. This is now
resolved and working correctly.