Fixed search screen

Fixed the search screen problems. I still need to actually run and test
this.