diff -r 5da2cf15eb44 -r 699781a1d6fd libidav/davqlparser.c
--- a/libidav/davqlparser.c	Mon Dec 18 16:24:32 2017 +0100
+++ b/libidav/davqlparser.c	Thu Dec 21 15:55:19 2017 +0100
@@ -279,13 +279,11 @@
         case DQLD_CMD_PT: dav_debug_ql_tree_print(examineexpr, 1); break;
         case DQLD_CMD_PF: dav_debug_ql_fnames_print(stmt); break;
         case DQLD_CMD_F:
-            if (examineclause != DQLD_CMD_F) {
-                examineclause = DQLD_CMD_F;
-                examineelem = stmt->fields;
-                examineexpr = stmt->fields ?
-                    ((DavQLField*)stmt->fields->data)->expr : NULL;
-                dav_debug_ql_expr_print(examineexpr);
-            }
+            examineclause = DQLD_CMD_F;
+            examineelem = stmt->fields;
+            examineexpr = stmt->fields ?
+                ((DavQLField*)stmt->fields->data)->expr : NULL;
+            dav_debug_ql_expr_print(examineexpr);
             break;
         case DQLD_CMD_W:
             examineclause = 0; examineelem = NULL;
@@ -293,13 +291,11 @@
             dav_debug_ql_expr_print(examineexpr);
             break;
         case DQLD_CMD_O:
-            if (examineclause != DQLD_CMD_O) {
-                examineclause = DQLD_CMD_O;
-                examineelem = stmt->orderby;
-                examineexpr = stmt->orderby ?
-                    ((DavQLOrderCriterion*)stmt->orderby->data)->column : NULL;
-                dav_debug_ql_expr_print(examineexpr);
-            }
+            examineclause = DQLD_CMD_O;
+            examineelem = stmt->orderby;
+            examineexpr = stmt->orderby ?
+                ((DavQLOrderCriterion*)stmt->orderby->data)->column : NULL;
+            dav_debug_ql_expr_print(examineexpr);
             break;
         case DQLD_CMD_N:
         case DQLD_CMD_P: