Improved simple and advanced search in node table