Search improvements #120