part of filters bugs corrected
Merge remote-tracking branch 'origin/master'