JBTM-1810

... is the same list as we use in the second scan