Use explicit types with sql tag where needed

Use explicit types with sql tag where needed #2127