Corrected sorting behaviour; fixed links highlighting