Emergency Map fixes

Signed-off-by: Jamini <mobiousjami@gmail.com>