20130524.01 - Fixing #15 and some cleanup for the query-result (less h3-usage)