AI-406 - list all target columns + NPE fix