First pass at #13 term filter / match