Continued work on filtered search