Improved /-search