moved back to LinkedHashMap for idMaps to fix ttc cases. Do bug fixes for new implementation in different branch