Added more SQL injection protection.