New search interpreter, Pair instead of Point, minor fix from last version