KFSCNTRB-1156_CR - code review fixes, prevent SQL injection
adding back origin code