MB-135 #servers.sql mostly refactored