More fixes for #143 on search screen