Fix possible NullPointerException
Bring back locale-aware sort order in library selection
Oehringen: Fix column table