PRD-4723: Additional fixes for the query-scripting part of the datasource UI