Xpath completion + removing silly moves