Replaced IFDS state by ParentedPathEdge
Moved logic for aliasquerys