Generic fixed and enhancements for Service Controller Encoders + Creating Secure Form