@@ -451,11 +451,11 @@ int  filter_add_acpatt(struct filter *m, const struct cli_ac_patt *pat)

 					spec->alt = pat->special_table[altcnt-1];

 					break;

 				    default:

+					stop = 1;

 					break;

 					/* TODO: should something be done here?

 					 * */

 				}

-				stop = 1;

 				break;

 			case CLI_MATCH_NIBBLE_HIGH:

 				spec->start = (p & 0xf0);

@@ -359,6 +359,8 @@ int cli_ac_buildtrie(struct cli_matcher *root)

 	return CL_SUCCESS;

     }

+    if (root->filter)

+	cli_warnmsg("Using filter for trie %d\n", root->type);

     return ac_maketrans(root);

 }

@@ -1693,6 +1695,7 @@ int cli_ac_addsig(struct cli_matcher *root, const char *virname, const char *hex

 	    mpool_free(root->mempool, root->filter);

 	    root->filter = NULL;

 	}

+	/* TODO: should this affect maxpatlen? */

     }

     for(i = 0; i < root->ac_maxdepth && i < new->length; i++) {

@@ -70,6 +70,7 @@ int cli_bm_addpatt(struct cli_matcher *root, struct cli_bm_patt *pattern, const

 	    mpool_free(root->mempool, root->filter);

 	    root->filter = NULL;

 	}

+	/* TODO: should this affect maxpatlen? */

     }

 #if BM_MIN_LENGTH == BM_BLOCK_SIZE

@@ -34,6 +34,7 @@

 #else

 /*TODO: maybe we need a GCC version check too here */

 #include <pthread.h>

+#include <assert.h>

 #include "cltypes.h"

 enum perf_log_sumable {