Fix service state calculation based on review comments