Save and search enhancement