Add check for no available location
Reverting clustering items
Update get GPS position