Search matching improvements, allow returning results also from fully matched directories