Improved manual search