Scanner needs improvement

Other ING Banking issues: