Refine schema to stick to AQUAINT DTD
Remove redundant data
Optimize XML parser and query, improving P@10 to 0.3400