Fixed errors in regex for arroyo and hydlab.