Better fix for #106 using DataQuery queryParams. Thanks simon_w