FIX: added more cases where there is possible a lowercase sort.