Synchronization

Bringing an outdated query server up to date.