Changed map handling in MapOpt to preserve unknown and available space costs