Added shortest path functions into match clause, fixed named identifier validation