KCINFR-1018: Committing SQL fixes
KCINFR-1018: Adding space