Consider dom locations with replace
Revert change that bring location node awareness