Directory search now works completely