6360: Fix to work with new model

git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@21212 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
6307: Use untranslated string in filter

git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@21214 4ae1f11a-8b86-4847-b8af-ab372f36d1fd