Map item handler; Fixed several bugs