Correct item map behavior and add new trigger to exit map