Add some fixes to SQL Cluster form

Change-Id: I072f0804a98b2b0a753b3e73badbcada3372c589
Merge "Add some fixes to SQL Cluster form"