Small correction to xtypes search.

Moved test for xtype-begins-with after name-full-match.
The same way they are ordered in results.