Switch filter to terms, re: #1019