Adding missing re
Improving shell escaping, removing space as exception