Map JS improvements