Improved search settings