improve numeric only id detection Upstream-commit: 70c6d806c8f43a91a324a352f69648a47c843335 Component: engine