fix filtering a little (but not yet)