- Add minimal SQL query to downgrade SQL script to avoid empty query errors
- Fix inconsistent behaviors with aliases referring to multiple servers