diff --git a/application/views/pages/includes/booking-form-en.php b/application/views/pages/includes/booking-form-en.php
index d91b073..b7ea7c4 100755
--- a/application/views/pages/includes/booking-form-en.php
+++ b/application/views/pages/includes/booking-form-en.php
@@ -59,40 +59,75 @@
                     <div class="serviceCol serviceCheckCol"></div>
                 </div>
                 <?php
-                $prevousCategory = '';
+                function canon_cat($s) {
+                    $s = html_entity_decode((string)$s, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+                    $s = strip_tags($s);  // removes "<p class=" junk etc.
+                    return trim($s);      // removes trailing/leading spaces
+                }
 
-                if(is_array($services)){
-                    foreach($services as $serviceItem){
-                        if($serviceItem->service_category != $prevousCategory){
+                if (is_array($services) && count($services) > 0) {
+
+                    // Build groups in first-seen order
+                    $groups = [];  // label => [items]
+                    $order  = [];  // labels in order of first appearance
+
+                    foreach ($services as $serviceItem) {
+                        $label = canon_cat($serviceItem->service_category ?? '');
+                        if ($label === '') $label = 'Other';
+
+                        if (!isset($groups[$label])) {
+                            $groups[$label] = [];
+                            $order[] = $label;
+                        }
+                        $groups[$label][] = $serviceItem;
+                    }
+
+                    // Render
+                    foreach ($order as $label) {
+                        ?>
+                        <div class="serviceRow">
+                            <div class="serviceCol" style="width: 100%">
+                                <h4><?php echo $label; ?></h4>
+                            </div>
+                        </div>
+                        <?php
+
+                        foreach ($groups[$label] as $serviceItem) {
                             ?>
                             <div class="serviceRow">
-                                <div class="serviceCol" style="width: 100%">
-                                    <h4><?php echo $serviceItem->service_category;?></h4>
+                                <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id; ?>">
+                                    <?php echo $serviceItem->service_name; ?>
+                                </div>
+
+                                <div class="serviceCol">
+                                    <input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id; ?>" value="<?php echo $serviceItem->service_time; ?>"/>
+                                </div>
+
+                                <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id; ?>">
+                                    <?php echo $serviceItem->service_price; ?>
+                                </div>
+
+                                <div class="serviceCol serviceInfoCol">
+                                    <div class="serviceInfoIcon">
+                                        <i class="fas fa-info-circle"></i>
+                                        <div class="serviceInfoLabel"><?php echo $serviceItem->service_description; ?></div>
+                                    </div>
+                                </div>
+
+                                <div class="serviceCol serviceCheckCol">
+                                    <input type="hidden" name="service_<?php echo $serviceItem->service_id; ?>" value="0"/>
+                                    <input type="checkbox"
+                                        class="service <?php echo $serviceItem->serv_cat_slug; ?>"
+                                        id="<?php echo $serviceItem->service_id; ?>"
+                                        name="service_<?php echo $serviceItem->service_id; ?>"
+                                        value="1"/>
                                 </div>
                             </div>
                             <?php
                         }
-                        ?>
-                        <div class="serviceRow">
-                            <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_name;?></div>
-                            <div class="serviceCol"><input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id;?>" value="<?php echo $serviceItem->service_time;?>"/></div>
-                            <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_price;?></div>
-                            <div class="serviceCol serviceInfoCol">
-                                <div class="serviceInfoIcon">
-                                    <i class="fas fa-info-circle"></i><div class="serviceInfoLabel"><?php echo $serviceItem->service_description;?></div>
-                                </div>
-                            </div>
-                            <div class="serviceCol serviceCheckCol">
-                                <input type="hidden" name="service_<?php echo $serviceItem->service_id;?>" value="0"/>
-                                
-                                <input type="checkbox" class="service <?php echo $serviceItem->serv_cat_slug;?>" id="<?php echo $serviceItem->service_id;?>" name="service_<?php echo $serviceItem->service_id;?>" value="1"/>
-                            </div>
-                        </div>
-                    <?php
-                    $prevousCategory = $serviceItem->service_category;
                     }
                 }
-            ?> 
+                ?>
         </div>
 
             
diff --git a/application/views/pages/includes/booking-form-hu.php b/application/views/pages/includes/booking-form-hu.php
index ff3a300..d15feb6 100755
--- a/application/views/pages/includes/booking-form-hu.php
+++ b/application/views/pages/includes/booking-form-hu.php
@@ -59,39 +59,75 @@
                     <div class="serviceCol serviceCheckCol"></div>
                 </div>
                 <?php
-                $prevousCategory = '';
+                function canon_cat($s) {
+                    $s = html_entity_decode((string)$s, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+                    $s = strip_tags($s);  // removes "<p class=" junk etc.
+                    return trim($s);      // removes trailing/leading spaces
+                }
 
-                if(is_array($services)){
-                    foreach($services as $serviceItem){
-                        if($serviceItem->service_category != $prevousCategory){
+                if (is_array($services) && count($services) > 0) {
+
+                    // Build groups in first-seen order
+                    $groups = [];  // label => [items]
+                    $order  = [];  // labels in order of first appearance
+
+                    foreach ($services as $serviceItem) {
+                        $label = canon_cat($serviceItem->service_category ?? '');
+                        if ($label === '') $label = 'Other';
+
+                        if (!isset($groups[$label])) {
+                            $groups[$label] = [];
+                            $order[] = $label;
+                        }
+                        $groups[$label][] = $serviceItem;
+                    }
+
+                    // Render
+                    foreach ($order as $label) {
+                        ?>
+                        <div class="serviceRow">
+                            <div class="serviceCol" style="width: 100%">
+                                <h4><?php echo $label; ?></h4>
+                            </div>
+                        </div>
+                        <?php
+
+                        foreach ($groups[$label] as $serviceItem) {
                             ?>
                             <div class="serviceRow">
-                                <div class="serviceCol" style="width: 100%">
-                                    <h4><?php echo $serviceItem->service_category;?></h4>
+                                <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id; ?>">
+                                    <?php echo $serviceItem->service_name; ?>
+                                </div>
+
+                                <div class="serviceCol">
+                                    <input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id; ?>" value="<?php echo $serviceItem->service_time; ?>"/>
+                                </div>
+
+                                <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id; ?>">
+                                    <?php echo $serviceItem->service_price; ?>
+                                </div>
+
+                                <div class="serviceCol serviceInfoCol">
+                                    <div class="serviceInfoIcon">
+                                        <i class="fas fa-info-circle"></i>
+                                        <div class="serviceInfoLabel"><?php echo $serviceItem->service_description; ?></div>
+                                    </div>
+                                </div>
+
+                                <div class="serviceCol serviceCheckCol">
+                                    <input type="hidden" name="service_<?php echo $serviceItem->service_id; ?>" value="0"/>
+                                    <input type="checkbox"
+                                        class="service <?php echo $serviceItem->serv_cat_slug; ?>"
+                                        id="<?php echo $serviceItem->service_id; ?>"
+                                        name="service_<?php echo $serviceItem->service_id; ?>"
+                                        value="1"/>
                                 </div>
                             </div>
                             <?php
                         }
-                        ?>
-                        <div class="serviceRow">
-                            <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_name;?></div>
-                            <div class="serviceCol"><input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id;?>" value="<?php echo $serviceItem->service_time;?>"/></div>
-                            <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_price;?></div>
-                            <div class="serviceCol serviceInfoCol">
-                                <div class="serviceInfoIcon">
-                                    <i class="fas fa-info-circle"></i><div class="serviceInfoLabel"><?php echo $serviceItem->service_description;?></div>
-                                </div>
-                            </div>
-                            <div class="serviceCol serviceCheckCol">
-                                <input type="hidden" name="service_<?php echo $serviceItem->service_id;?>" value="0"/>
-                                <input type="checkbox" class="service <?php echo $serviceItem->serv_cat_slug;?>" id="<?php echo $serviceItem->service_id;?>" name="service_<?php echo $serviceItem->service_id;?>" value="1"/>
-                            </div>
-                        </div>
-                    <?php
-                    $prevousCategory = $serviceItem->service_category;
                     }
                 }
-            ?> 
+                ?>
         </div>
 
             
diff --git a/application/views/pages/includes/booking-form-no.php b/application/views/pages/includes/booking-form-no.php
index 6345f04..40a067a 100755
--- a/application/views/pages/includes/booking-form-no.php
+++ b/application/views/pages/includes/booking-form-no.php
@@ -59,40 +59,75 @@
                     <div class="serviceCol serviceCheckCol"></div>
                 </div>
                 <?php
-                $prevousCategory = '';
+function canon_cat($s) {
+    $s = html_entity_decode((string)$s, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+    $s = strip_tags($s);  // removes "<p class=" junk etc.
+    return trim($s);      // removes trailing/leading spaces
+}
 
-                if(is_array($services)){
-                    foreach($services as $serviceItem){
-                        if($serviceItem->service_category != $prevousCategory){
-                            ?>
-                            <div class="serviceRow">
-                                <div class="serviceCol" style="width: 100%">
-                                    <h4><?php echo $serviceItem->service_category;?></h4>
-                                </div>
-                            </div>
-                            <?php
-                        }
-                        ?>
-                        <div class="serviceRow">
-                            <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_name;?></div>
-                            <div class="serviceCol"><input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id;?>" value="<?php echo $serviceItem->service_time;?>"/></div>
-                            <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id;?>"><?php echo $serviceItem->service_price;?></div>
-                            <div class="serviceCol serviceInfoCol">
-                                <div class="serviceInfoIcon">
-                                    <i class="fas fa-info-circle"></i><div class="serviceInfoLabel"><?php echo $serviceItem->service_description;?></div>
-                                </div>
-                            </div>
-                            <div class="serviceCol serviceCheckCol">
-                                <input type="hidden" name="service_<?php echo $serviceItem->service_id;?>" value="0"/>
-                                
-                                <input type="checkbox" class="service <?php echo $serviceItem->serv_cat_slug;?>" id="<?php echo $serviceItem->service_id;?>" name="service_<?php echo $serviceItem->service_id;?>" value="1"/>
+if (is_array($services) && count($services) > 0) {
+
+    // Build groups in first-seen order
+    $groups = [];  // label => [items]
+    $order  = [];  // labels in order of first appearance
+
+    foreach ($services as $serviceItem) {
+        $label = canon_cat($serviceItem->service_category ?? '');
+        if ($label === '') $label = 'Other';
+
+        if (!isset($groups[$label])) {
+            $groups[$label] = [];
+            $order[] = $label;
+        }
+        $groups[$label][] = $serviceItem;
+    }
+
+    // Render
+    foreach ($order as $label) {
+        ?>
+        <div class="serviceRow">
+            <div class="serviceCol" style="width: 100%">
+                <h4><?php echo $label; ?></h4>
+            </div>
+        </div>
+                <?php
+
+                foreach ($groups[$label] as $serviceItem) {
+                    ?>
+                    <div class="serviceRow">
+                        <div class="serviceCol serviceNameCol" id="serviceName_<?php echo $serviceItem->service_id; ?>">
+                            <?php echo $serviceItem->service_name; ?>
+                        </div>
+
+                        <div class="serviceCol">
+                            <input type="time" class="serviceTime" id="time_<?php echo $serviceItem->service_id; ?>" value="<?php echo $serviceItem->service_time; ?>"/>
+                        </div>
+
+                        <div class="serviceCol servicePriceCol" id="servicePrice_<?php echo $serviceItem->service_id; ?>">
+                            <?php echo $serviceItem->service_price; ?>
+                        </div>
+
+                        <div class="serviceCol serviceInfoCol">
+                            <div class="serviceInfoIcon">
+                                <i class="fas fa-info-circle"></i>
+                                <div class="serviceInfoLabel"><?php echo $serviceItem->service_description; ?></div>
                             </div>
                         </div>
+
+                        <div class="serviceCol serviceCheckCol">
+                            <input type="hidden" name="service_<?php echo $serviceItem->service_id; ?>" value="0"/>
+                            <input type="checkbox"
+                                class="service <?php echo $serviceItem->serv_cat_slug; ?>"
+                                id="<?php echo $serviceItem->service_id; ?>"
+                                name="service_<?php echo $serviceItem->service_id; ?>"
+                                value="1"/>
+                        </div>
+                    </div>
                     <?php
-                    $prevousCategory = $serviceItem->service_category;
-                    }
                 }
-            ?> 
+            }
+        }
+        ?> 
         </div>