fixed saving and favouriting issue