Added buildoptions to the query module