Some improvements to make sure items will be routed as optimally as possible, even if they are inserted wrongly