FIXED: Update SQL for uniformity and syntax errors