Messy hack day update
add query_type