Improved search example