get rid of query helpers mix in