fix: cfilter removing space + clean in cfilter
Merge branch 'bugfixes' into develop
fix: consolidation fix