Fixed regular expression and data ordering