Moved keywordfilter
Fixed some list bugs
Made None [None]
Introduced FilterBase class
Merge branch 'working'