Flat object field should delegate to keyword field for most query types

Flat object field should delegate to keyword field for most query types #89