Add query fields