improved filtered search
fixed ethn/xithan merge conflict