#6494 Update SQL, UI and others