Fixed several formatting issues.
Refactored == null to is_null == '' to empty(...)