Internal ID Mapping Improvements

fixing race cases, where internal single digit IDs (tabs) where getting
mapped twice.