Slightly better XPATH queries