Merge branch 'main' into f-event-name

sample-management-custom/caosdb-server/scripting/bin/export_sample_csv.py

@@ -626,7 +626,7 @@ def main():
                 logger.info("Removing empty columns from export")
                 no_empty_columns = True
 
-            elif "query_string" in form_data and form_data["query_string"]:
+            if "query_string" in form_data and form_data["query_string"]:
                 query_string = form_data["query_string"]
                 if not query_string.lower().startswith("find ") and not query_string.lower().startswith("select "):
                     logger.error(