Improve filterability re commit 9cc09ac