Some changes to waitlists
Function changes