Fix issue with substring filters including even query options