further improvements to ID extension support