More elegant treatment of searching to cope with Android