Avoid unconditionally overwritting query_type and multiplicity in query declarations