nicer code and fixes to add a collection/database with more than one server opened