diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml
index c1759d0..33d07a3 100644
--- a/.github/workflows/release_workflow.yml
+++ b/.github/workflows/release_workflow.yml
@@ -44,7 +44,7 @@ jobs:
         
         # DYNAMIC LOGIC for 'name':
         # Same dynamic logic applied to the release name.
-        name: Update Release ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
+        name: Release ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
 
         # Set draft to false if the intention is to publish/update a final version.
         draft: false
diff --git a/release/aqualinkd-arm64 b/release/aqualinkd-arm64
index a77f6bf..5a8d285 100755
Binary files a/release/aqualinkd-arm64 and b/release/aqualinkd-arm64 differ
diff --git a/release/aqualinkd-armhf b/release/aqualinkd-armhf
index cd4c1e7..6f3d7d6 100755
Binary files a/release/aqualinkd-armhf and b/release/aqualinkd-armhf differ
diff --git a/source/pda_aq_programmer.c b/source/pda_aq_programmer.c
index 6b72d6f..fdab7f4 100644
--- a/source/pda_aq_programmer.c
+++ b/source/pda_aq_programmer.c
@@ -1431,11 +1431,17 @@ PDA Line 9 = item and press
 
   // At the menus above if we just get CMD_PDA_HIGHLIGHT then we need to press enter to set the %
   // if it's CMD_PDA_HIGHLIGHT then CMD_PDA_HIGHLIGHTCHARS, we can simply set the %
+
+  // At this point the Aquapure menu should be showing, if the last message was CMD_PDA_HIGHLIGHTCHARS then we
+  // only need to change value, so check and wait a few more messages so see it.  if not we assume we need to select
+  // a device to change ie Pool or Spa.
   bool selected=false;
-  waitForPDAMessageType(aqdata,CMD_PDA_HIGHLIGHT, 15);
-  if ( waitForPDAMessageType(aqdata,CMD_PDA_HIGHLIGHTCHARS, 2)) {
-    selected = true;
-  }
+  //waitForPDAMessageType(aqdata,CMD_PDA_HIGHLIGHT, 15);
+  //if (aqdata->last_packet_type != CMD_PDA_HIGHLIGHTCHARS) { // not needed, waitForPDAMessageType will return if last message was CMD_PDA_HIGHLIGHTCHARS
+    if ( waitForPDAMessageType(aqdata,CMD_PDA_HIGHLIGHTCHARS, 4)) {
+      selected = true;
+    }
+  //}
 
 if (selected) {
   LOG(PDA_LOG,LOG_DEBUG, "SWG %% already selected\n");
diff --git a/source/version.h b/source/version.h
index a0eb46b..5c222d4 100644
--- a/source/version.h
+++ b/source/version.h
@@ -4,5 +4,5 @@
 #define AQUALINKD_SHORT_NAME "AqualinkD"
 
 // Use Magor . Minor . Patch
-#define AQUALINKD_VERSION "3.0.3 (dev.4)"
+#define AQUALINKD_VERSION "3.0.3 (dev.5)"
  
\ No newline at end of file