Remove usage of "goto" from sorter code; added secondary sort "byDate" to Genre Sorting