Fix bug with "same name different iso" query, and tidy up the output