Made text filter better