Added checks for strictColumns and changed the data looped.
Now we don't loop through the columns but through the data available (after filtering ofcourse)