Added options for sorting, only, highlight; improved short display