Refactor the XML search part

[mr-awk]

Is your feature request related to a problem? Please describe.
the code is hard to read and very ugly. First draft warning on the code.

Describe the solution you'd like
There is a lot of if statements that needs to be refactored