Tartaros: Updated mapping to include all query pages.