Improve load/unload map and revolv bug around it