Fix xml import
Improve search
Merge pull request #6 from lucdionpq/more_stuff

Fix xml import