Some progress made on fixing search. Problem isolated to function that matches nodes.