Improved PathExpression support for labels