Different data structure for aggregating the filters
Remove some logging
Merge pull request #93 from undp/speed-fixes-2

Speed fixes 2