Enhanced search and updated settings