make sure the new id fetching logic is used in all places
Release 2.2.3