Moved keywordfilter
Fixed some list bugs
Made None [None]