Minor code completion improvements

Schema object is filtered out when equals to the node value on which
suggestion pops out
Removal of join condition suggested at wrong place