Unchecked cast fix, better JSON-Query mapping
Merge branch 'feature-jetty' into develop