Supposedly fix persistence bug (still dont know what caused it, cant
reproduce)

Add filter names
Merge remote-tracking branch 'whatsToDo/master'