Use querybuilder Fix #42