Ensure we check both item and block registries when finding valid IDs. Should fix #365