More grep improved