add scheme to bill identifiers and fix related entity bug