updated DefaultQuery and PropertyFilteredIterable to handle ID and EdgeLabel checking accordingly. Ref #328