Search update to allow useful directory filter

Also, revamp of find algorithm