Make changes for openshift; fix empty input issue