Moved logic of userfavorites to service level