Sort by rank and add option to sort by rank

CORE-31 #close #comment Does not allow escaping of ;