Improve performance on tab completion
Fix grep complains