I don't know Scala
Fixed SQL
Replaced dummy data
Model changes
Tweaking