favorites handler improvements