Corrected defaults for query builder to maintain original state of defaults