Improve regex and add simple checker for special characters