ID selector, robustness, and other improvements. #14888

Change-Id: I827a1415be2bd70e823763c0a94249c15c5d1e00