Fixed escaping issues and exclusion issues.