Added Waiver Search class and fixed a few U/I bugs