Update XQuery to not destroy submits and display only when enabled.