Fix sloppy coding mistakes from 9e3fd38

Should fix remaining notices and obvious UI quirks in IW searches

Change-Id: Icafb54a7261943e0842cdb11d03e53cbc9a44602
Clean up some unused code

Change-Id: Ia6ba4f7552a8b70ce836d33d96a4a58a63c49dc3