fix for regex matching and serving