Apply @ocorreiododiogo PR #2 fixing issue with hidden maps, plus correct issue with default location detection