change encryption for ORV and more
ORV encryption fix + cross site scripting check fix