SQL fixes
Merge pull request #322 from BuracayBeach/team3_v3.1

SQL fixes