Improved header handling

• Significantly improved support of table headers by using the enhanced query parsing algorithm.