Add default id handling to add-fetch