final search fixes/changes