Add exluding time slots and new sort option