Issue #7: make search work on handset