More Cleaning + Introduced Error When Searching

When searching the folder name and path are always blank now rather then
being incorrect