Adding "source" to xpath, ref #1