diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index ed30211df1..2554bc04e7 100644
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -479,7 +479,7 @@ rwm_int_filter_map_rewrite(
 		return LDAP_OTHER;
 	}
 
-	switch ( f->f_choice ) {
+	switch ( f->f_choice & SLAPD_FILTER_MASK ) {
 	case LDAP_FILTER_EQUALITY:
 		ad = f->f_av_desc;
 		if ( map_attr_value( dc, &ad, &atmp,
@@ -688,7 +688,7 @@ rwm_int_filter_map_rewrite(
 		break;
 	}
 
-	case 0:
+	case -1:
 computed:;
 		filter_free_x( op, f );
 		f->f_choice = SLAPD_FILTER_COMPUTED;