Improved search and minor treatment