refactoring
fixed query handling
using the new utility methods from api
fix: forgot to add correlation id for responses
fixed json parsing of resulsets