* Fixed some sorting related glitches