[Sharan/Hernan] Changed logic around computing zone. Moved from regex to split