With that change, 'CMSSiteTreeFilter_Search' doesn't make sense anymore. API change though, so probably not appropriate until 3.2 :-|