Change week06/q6 -> q1
Fix homework considering new database schema