Fixed WaitlistSearch (ish)

There's a subtle bug explained in the comments in line 131. Will debug
later.