Moved finalise options to separate schemata
Don't encrypt blank values