fix data collection, check if regex group exists