update to latest query syntax

*   use the separator method from the db class
*   add db name to queries
discard old specific servers, one to rule them all