Re-worked the logic for where .selector and .context are added for ID selectors ...