updated options to use single field
still updating options to store in single db field
updated options. Saving and updating properly now
Merge branch '1.3.5'