improved favorites impl