GCP-5953 add hidden variable id and change labels