More refinements in locations mapping and added support to check online connectivity