Use uasort(), not usort()

- usort() does not keep keys, while uasort() does; we need the keys for
  linking.
Merge branch 'hotfix/security-links'