Added question marks to some fields