Update the assignment with new queries

The last queries posted had a couple of bugs. Response to
#61 and #78 issues.