better search fixes #33