Regex fix to support dataset names that start with numbers