Added prefix/suffix and time sorting