Fix option handling array merges for fields