added - and _ to allowed characters