Remove grep and insted use regex with return_stdout