Einthusan - Small xpath changes