Merge pull request #6663 from MrPetovan/bug/frio-fix-saved-search-button-display