Remove the base filter and add proper LIKE support