Improved X-Tags support.