Fixed sort to include non-linked sites + #100