xpath fixes