Use the node annotation namespace/name in the find sql generator to make the results distinct.

The distinct condition has been updated to be more conservative