calendar impl and fixed broken save searches