Added leading space before OR and AND, fixes # 1368