updated for AtomEntity changes
updated xpath