Fixed filter and orderby. Added order for Category