Filter now remembers last choices
Merge branch 'GenericTable'