diff --git a/bin/scanloc b/bin/scanloc
index 4fbdeca..5371f7f 100755
Binary files a/bin/scanloc and b/bin/scanloc differ
diff --git a/bin/scconfig b/bin/scconfig
index 01ccb76..ccb0591 100755
Binary files a/bin/scconfig and b/bin/scconfig differ
diff --git a/etc/descriptions/scanloc_multifeature.xml b/etc/descriptions/scanloc_multifeature.xml
index 1699f1b..729d072 100644
--- a/etc/descriptions/scanloc_multifeature.xml
+++ b/etc/descriptions/scanloc_multifeature.xml
@@ -25,6 +25,23 @@
 						depth and RMS.
 						
 					
+
+					
+						
+						This is the maximum allowed depth. Origins with
+						depth greater then this value get a score equal to
+						"defaultScore".
+						
+					
+
+					
+						
+						This is the maximum allowed RMS. Origins with
+						residual greater than this value score of equal to
+						"defaultScore".
+						
+					
+
 					
 					
 						
@@ -79,9 +96,6 @@
 							Origin depth is normalized to this value for
 							computing the score contribution. Shallower depths
 							contribute to larger score.
-							This is also the maximum allowed depth. Origins with
-							depth greater then this value get a score equal to
-							"defaultScore".
 							
 						
 
@@ -96,9 +110,6 @@
 							Origin RMS is normalized to this value for computing
 							the score contribution. Lower RMS contribute to
 							larger score.
-							This is also the maximum allowed RMS. Origins with
-							residual greater than this value score equal to
-							"defaultScore".
 							
 						
 
diff --git a/etc/descriptions/scevent_multifeature.xml b/etc/descriptions/scevent_multifeature.xml
index 9bad8c7..00305c1 100644
--- a/etc/descriptions/scevent_multifeature.xml
+++ b/etc/descriptions/scevent_multifeature.xml
@@ -27,6 +27,23 @@
 						depth and RMS.
 						
 					
+
+					
+						
+						This is the maximum allowed depth. Origins with
+						depth greater then this value get a score equal to
+						"defaultScore".
+						
+					
+
+					
+						
+						This is the maximum allowed RMS. Origins with
+						residual greater than this value score of equal to
+						"defaultScore".
+						
+					
+
 					
 					
 						
@@ -76,14 +93,11 @@
 						
 
 						
-						
+						
 							
 							Origin depth is normalized to this value for
 							computing the score contribution. Shallower depths
 							contribute to larger score.
-							This is also the maximum allowed depth. Origins with
-							depth greater then this value get a score equal to
-							"defaultScore".
 							
 						
 
@@ -93,14 +107,11 @@
 							
 						
 
-						
+						
 							
 							Origin RMS is normalized to this value for computing
 							the score contribution. Lower RMS contribute to
 							larger score.
-							This is also the maximum allowed RMS. Origins with
-							residual greater than this value score of equal to
-							"defaultScore".
 							
 						
 
diff --git a/include/seiscomp/version.h b/include/seiscomp/version.h
index 0ca0530..e34e62e 100644
--- a/include/seiscomp/version.h
+++ b/include/seiscomp/version.h
@@ -26,7 +26,7 @@
 
 #define SEISCOMP_VERSION_MAJOR  6
 #define SEISCOMP_VERSION_MINOR  9
-#define SEISCOMP_VERSION_PATCH  0
+#define SEISCOMP_VERSION_PATCH  1
 
 #define SEISCOMP_VERSION ((SEISCOMP_VERSION_MAJOR << 0x10) |\
                           (SEISCOMP_VERSION_MINOR << 0x08) |\
diff --git a/lib/libseiscomp_core.so.16.4.0 b/lib/libseiscomp_core.so.16.4.0
index c93fe4a..9349c5c 100644
Binary files a/lib/libseiscomp_core.so.16.4.0 and b/lib/libseiscomp_core.so.16.4.0 differ
diff --git a/lib/python/seiscomp/fdsnws/availability.py b/lib/python/seiscomp/fdsnws/availability.py
index 27f990f..3af79e3 100644
--- a/lib/python/seiscomp/fdsnws/availability.py
+++ b/lib/python/seiscomp/fdsnws/availability.py
@@ -12,8 +12,6 @@
 # Email:   herrnkind@gempa.de
 ###############################################################################
 
-from functools import cmp_to_key
-
 from collections import OrderedDict
 
 from twisted.cred import portal
@@ -33,7 +31,7 @@ from . import utils
 
 
 DBMaxUInt = 18446744073709551615  # 2^64 - 1
-VERSION = "1.0.3"
+VERSION = "1.0.4"
 
 
 ###############################################################################
@@ -1349,19 +1347,21 @@ class FDSNAvailabilityQuery(_Availability):
                     if ro.time.start.microseconds() == 0:
                         q += f"AND {_T('end')} >= '{db.timeToString(ro.time.start)}' "
                     else:
+                        startTimeStr = db.timeToString(ro.time.start)
                         q += (
-                            "AND ({0} > '{1}' OR ("
-                            f"{_T('end')} = '{db.timeToString(ro.time.start)}' AND "
+                            f"AND ({_T('end')} > '{startTimeStr}' OR ("
+                            f"{_T('end')} = '{startTimeStr}' AND "
                             f"end_ms >= {ro.time.start.microseconds()})) "
                         )
                 if ro.time.end is not None:
                     if ro.time.end.microseconds() == 0:
                         q += f"AND {_T('start')} < '{db.timeToString(ro.time.end)}' "
                     else:
+                        endTimeStr = db.timeToString(ro.time.end)
                         q += (
-                            "AND ({0} < '{1}' OR ("
-                            f"{_T('start')} = '{db.timeToString(ro.time.end)}' AND "
-                            "start_ms < {ro.time.end.microseconds()})) "
+                            f"AND ({_T('start')} < '{endTimeStr}' OR ("
+                            f"{_T('start')} = '{endTimeStr}' AND "
+                            f"start_ms < {ro.time.end.microseconds()})) "
                         )
             if ro.quality:
                 qualities = "', '".join(ro.quality)
diff --git a/share/doc/scanloc/CHANGELOG b/share/doc/scanloc/CHANGELOG
index 86530d2..4da11c1 100644
--- a/share/doc/scanloc/CHANGELOG
+++ b/share/doc/scanloc/CHANGELOG
@@ -2,6 +2,12 @@
 
 All notable changes to scanloc and add-ons will be documented in this file.
 
+## 2025.295
+
+## Fixed
+
+-   Bug in S pick association introduced with release 2025.280
+
 ## 2025.280
 
 ## Added
diff --git a/share/doc/scanloc/html/_sources/apps/scanloc.rst.txt b/share/doc/scanloc/html/_sources/apps/scanloc.rst.txt
index 4f8c07b..2850791 100644
--- a/share/doc/scanloc/html/_sources/apps/scanloc.rst.txt
+++ b/share/doc/scanloc/html/_sources/apps/scanloc.rst.txt
@@ -2361,6 +2361,28 @@ score processor.
    depth and RMS.
 
 
+.. confval:: score.mf.ignoreDepth
+
+   Default: ``650.0``
+
+   Type: *double*
+
+   This is the maximum allowed depth. Origins with
+   depth greater then this value get a score equal to
+   \"defaultScore\".
+
+
+.. confval:: score.mf.maxRMS
+
+   Default: ``1.5``
+
+   Type: *double*
+
+   This is the maximum allowed RMS. Origins with
+   residual greater than this value score of equal to
+   \"defaultScore\".
+
+
 .. confval:: score.mf.strongMotionCodes
 
    Default: ``L,N``
@@ -2436,9 +2458,6 @@ score processor.
    Origin depth is normalized to this value for
    computing the score contribution. Shallower depths
    contribute to larger score.
-   This is also the maximum allowed depth. Origins with
-   depth greater then this value get a score equal to
-   \"defaultScore\".
 
 
 .. confval:: score.mf.weights.depth
@@ -2459,9 +2478,6 @@ score processor.
    Origin RMS is normalized to this value for computing
    the score contribution. Lower RMS contribute to
    larger score.
-   This is also the maximum allowed RMS. Origins with
-   residual greater than this value score equal to
-   \"defaultScore\".
 
 
 .. confval:: score.mf.weights.residual
diff --git a/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt b/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt
index 86530d2..4da11c1 100644
--- a/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt
+++ b/share/doc/scanloc/html/_sources/base/CHANGELOG.md.txt
@@ -2,6 +2,12 @@
 
 All notable changes to scanloc and add-ons will be documented in this file.
 
+## 2025.295
+
+## Fixed
+
+-   Bug in S pick association introduced with release 2025.280
+
 ## 2025.280
 
 ## Added
diff --git a/share/doc/scanloc/html/apps/global.html b/share/doc/scanloc/html/apps/global.html
index 3e7b83d..8061100 100644
--- a/share/doc/scanloc/html/apps/global.html
+++ b/share/doc/scanloc/html/apps/global.html
@@ -24,7 +24,7 @@
         
         
            scanloc: Phase Associator 
-           2025.281#4efc2c878
+           2025.295#8bb1059a0
         
       
     
@@ -2807,7 +2807,7 @@ GUI applications.