Made filtering possible by many keys, but not all.  Still buggy