Fixes #5 #6 - Splitting target search per node type. Removing the possibility duplicated object matches.