Updated iter files and enquiry and issues to allow id rather than name