Improve grep quoting