#511 better handling for empty favorites