Revert "use number instead of id"

This reverts commit 12b2ee61bff3ce7c961ad9a2610f5fcac4b5f14e.