More updates to the Auto Id Selection