Fix issues with StarRating