A better search with sunspot fix #111