Filtered search/ various bug fixes