Fix regex and orderby, then done