Added proper data refresh when using current location option.