minor: make searches reasumeable/extendable