pybs: improve search