Change QueryGraph to store optional matches as sub queries
Rename also elements inside pattern expressions
Move helper identifier name functionality to a support class
Teach SimpleQueryGraphBuilder to extract pattern predicates into sub queries