Fixed filter, fixed and finished favorites behavior