Add secondary sort to search because otherwise it's a mess