ExtractQuery method was not quite right.
Contains and ToString
FirstMethodCallInterpreter