Attempt to fix filtering, refs #58.