#193 Add logic for option to use custom sort