fixes for 1.8. configurable group regex and default