Handle correctly fields options