Fixed possible issue with spaces in ${req}