fix ids to include instanceNo