Add %% funtionality
Update the grep option