Revert "fix error with ID"

This reverts commit cbacc269f6edf7d976a7c00ed281329187773496.
fix id and public data fixes