Improve selection of saved searches upon unsubscribe [MJ-356]