diff --git a/client/src/app/instance/documentation/components/output-list.component.html b/client/src/app/instance/documentation/components/output-list.component.html
index 14fa0ec4fa11969501ef9c13e0b601c44864abba..faea97f341326c10a007aa2b32c4cb98c10c032d 100644
--- a/client/src/app/instance/documentation/components/output-list.component.html
+++ b/client/src/app/instance/documentation/components/output-list.component.html
@@ -1,12 +1,12 @@
<h4>Available outputs for {{ datasetSelected }}</h4>
-<table id="table" class="attributes-table p-0">
+<table id="table" class="attributes-table p-0" aria-describedby="Attribute list">
<tr>
- <th>id</th>
- <th>attribute</th>
+ <th id="id">id</th>
+ <th id="attribute">attribute</th>
</tr>
<tr *ngFor="let attribute of attributeList">
- <td>{{ attribute.id }}</td>
- <td>{{ attribute.name }}</td>
+ <td [headers]="'id ' + attribute.id">{{ attribute.id }}</td>
+ <td [headers]="'attribute ' + attribute.name">{{ attribute.name }}</td>
</tr>
</table>
diff --git a/client/src/app/instance/documentation/containers/documentation.component.html b/client/src/app/instance/documentation/containers/documentation.component.html
index 95e84e96074cd5134d731c5fbaa6746f50b07ee3..78cc01f7433cbf273bb4784ac5a142c311896628 100644
--- a/client/src/app/instance/documentation/containers/documentation.component.html
+++ b/client/src/app/instance/documentation/containers/documentation.component.html
@@ -34,122 +34,122 @@
</app-output-list>
<h5>Operators</h5>
- <table id="table">
+ <table id="table" aria-describedby="Operator description">
<tr>
- <th>operator</th>
- <th>description</th>
- <th>usage</th>
- <th>example</th>
+ <th id="operator">operator</th>
+ <th id="description">description</th>
+ <th id="usage">usage</th>
+ <th id="example">example</th>
</tr>
<tr>
- <td>eq</td>
- <td>equal to</td>
- <td><code>c=id_attribute::eq::value</code></td>
- <td><code>c=1::eq::89</code></td>
+ <td headers="operator eq">eq</td>
+ <td headers="description eq">equal to</td>
+ <td headers="usage eq"><code>c=id_attribute::eq::value</code></td>
+ <td headers="example eq"><code>c=1::eq::89</code></td>
</tr>
<tr>
- <td>neq</td>
- <td>not equal to</td>
- <td><code>c=id_attribute::neq::value</code></td>
- <td><code>c=1::neq::89</code></td>
+ <td headers="operator neq">neq</td>
+ <td headers="description neq">not equal to</td>
+ <td headers="usage neq"><code>c=id_attribute::neq::value</code></td>
+ <td headers="example neq"><code>c=1::neq::89</code></td>
</tr>
<tr>
- <td>gt</td>
- <td>greater than</td>
- <td><code>c=id_attribute::gt::value</code></td>
- <td><code>c=1::gt::1.5</code></td>
+ <td headers="operator gt">gt</td>
+ <td headers="description gt">greater than</td>
+ <td headers="usage gt"><code>c=id_attribute::gt::value</code></td>
+ <td headers="example gt"><code>c=1::gt::1.5</code></td>
</tr>
<tr>
- <td>gte</td>
- <td>greater than or equal to</td>
- <td><code>c=id_attribute::gte::value</code></td>
- <td><code>c=1::gte::2</code></td>
+ <td headers="operator gte">gte</td>
+ <td headers="description gte">greater than or equal to</td>
+ <td headers="usage gte"><code>c=id_attribute::gte::value</code></td>
+ <td headers="example gte"><code>c=1::gte::2</code></td>
</tr>
<tr>
- <td>lt</td>
- <td>lower than</td>
- <td><code>c=id_attribute::lt::value</code></td>
- <td><code>c=1::lt::1.5</code></td>
+ <td headers="operator lt">lt</td>
+ <td headers="description lt">lower than</td>
+ <td headers="usage lt"><code>c=id_attribute::lt::value</code></td>
+ <td headers="example lt"><code>c=1::lt::1.5</code></td>
</tr>
<tr>
- <td>lte</td>
- <td>lower than or equal to</td>
- <td><code>c=id_attribute::lte::value</code></td>
- <td><code>c=1::lte::2</code></td>
+ <td headers="operator lte">lte</td>
+ <td headers="description lte">lower than or equal to</td>
+ <td headers="usage lte"><code>c=id_attribute::lte::value</code></td>
+ <td headers="example lte"><code>c=1::lte::2</code></td>
</tr>
<tr>
- <td>bw</td>
- <td>between</td>
- <td><code>c=id_attribute::bw::value_min|value_max</code></td>
- <td><code>c=1::bw::10|90</code></td>
+ <td headers="operator bw">bw</td>
+ <td headers="description bw">between</td>
+ <td headers="usage bw"><code>c=id_attribute::bw::value_min|value_max</code></td>
+ <td headers="example bw"><code>c=1::bw::10|90</code></td>
</tr>
<tr>
- <td>lk</td>
- <td>like</td>
- <td><code>c=id_attribute::lk::value</code></td>
- <td><code>c=1::lk::ping</code></td>
+ <td headers="operator lk">lk</td>
+ <td headers="description lk">like</td>
+ <td headers="usage lk"><code>c=id_attribute::lk::value</code></td>
+ <td headers="example lk"><code>c=1::lk::ping</code></td>
</tr>
<tr>
- <td>nlk</td>
- <td>not like</td>
- <td><code>c=id_attribute::nlk::value</code></td>
- <td><code>c=1::nlk::pong</code></td>
+ <td headers="operator nlk">nlk</td>
+ <td headers="description nlk">not like</td>
+ <td headers="usage nlk"><code>c=id_attribute::nlk::value</code></td>
+ <td headers="example nlk"><code>c=1::nlk::pong</code></td>
</tr>
<tr>
- <td>in</td>
- <td>in</td>
- <td><code>c=id_attribute::in::value_x|value_y|value_z</code></td>
- <td><code>c=1::in::ping|pong|paff</code></td>
+ <td headers="operator in">in</td>
+ <td headers="description in">in</td>
+ <td headers="usage in"><code>c=id_attribute::in::value_x|value_y|value_z</code></td>
+ <td headers="example in"><code>c=1::in::ping|pong|paff</code></td>
</tr>
<tr>
- <td>nin</td>
- <td>not in</td>
- <td><code>c=id_attribute::nin::value_x|value_y|value_z</code></td>
- <td><code>c=1::nin::ping|pong|paf</code></td>
+ <td headers="operator nin">nin</td>
+ <td headers="description nin">not in</td>
+ <td headers="usage nin"><code>c=id_attribute::nin::value_x|value_y|value_z</code></td>
+ <td headers="example nin"><code>c=1::nin::ping|pong|paf</code></td>
</tr>
<tr>
- <td>nl</td>
- <td>is null</td>
- <td><code>c=id_attribute::nl</code></td>
- <td><code>c=1::nl</code></td>
+ <td headers="operator nl">nl</td>
+ <td headers="description nl">is null</td>
+ <td headers="usage nl"><code>c=id_attribute::nl</code></td>
+ <td headers="example nl"><code>c=1::nl</code></td>
</tr>
<tr>
- <td>nnl</td>
- <td>is not null</td>
- <td><code>c=id_attribute::nnl</code></td>
- <td><code>c=1::nnl</code></td>
+ <td headers="operator nnl">nnl</td>
+ <td headers="description nnl">is not null</td>
+ <td headers="usage nnl"><code>c=id_attribute::nnl</code></td>
+ <td headers="example nnl"><code>c=1::nnl</code></td>
</tr>
<tr>
- <td>js</td>
- <td>json</td>
- <td><code>c=id_attribute::js::extension,keyword|operator|value</code></td>
- <td><code>c=1::js::PrimaryHDU,ID|eq|45</code></td>
+ <td headers="operator js">js</td>
+ <td headers="description js">json</td>
+ <td headers="usage js"><code>c=id_attribute::js::extension,keyword|operator|value</code></td>
+ <td headers="example js"><code>c=1::js::PrimaryHDU,ID|eq|45</code></td>
</tr>
</table>
<h4>Examples</h4>
We supposed to have the dataset ping with following attributes:
- <table id="table">
+ <table id="table" aria-describedby="Attribute list example">
<tr>
- <th>id</th>
- <th>attribute</th>
+ <th id="id">id</th>
+ <th id="attribute">attribute</th>
</tr>
<tr>
- <td>1</td>
- <td>obs_id</td>
+ <td headers="id 1">1</td>
+ <td headers="attribute obs_id">obs_id</td>
</tr>
<tr>
- <td>2</td>
- <td>ra</td>
+ <td headers="id 2">2</td>
+ <td headers="attribute ra">ra</td>
</tr>
<tr>
- <td>3</td>
- <td>dec</td>
+ <td headers="id 3">3</td>
+ <td headers="attribute dec">dec</td>
</tr>
<tr>
- <td>4</td>
- <td>instrument</td>
+ <td headers="id 4">4</td>
+ <td headers="attribute instrument">instrument</td>
</tr>
</table>