Further refined xpath so I have to do less list/string manipulation