add fix from shared code, fix nth-child (stupid angular) (DEV-14592)