Add rudimentary search support