Fixed a few issues with indexes in waitlist