CONN-683: Fixed the SQL Injection issues