We now load markers if locations != true (handles case where locations is empty)
We now reload locations on the edge cases where locations is empty