Query Builder: after deleting and re-adding the COMPOSITION, the template ID isn't re-inserted

[askask]

Steps to reproduce:

• Go to Criteria Editor page
• Open the query builder
• Add an arbitrary element to SELECT → A composition is automatically added to FROM
• Click Apply Selection → The resulting AQL code contains WHERE c1/archetype_details/template_id/value = '<template name>'
• Open the query builder again
• Delete the composition → The SELECT part is deleted automatically
• Add the same arbitrary element to SELECT again → The composition is automatically re-added
• Click Apply Selection → The resulting AQL does not contain the template_id part