Fixed issues with GEN-1 and GEN-3 as reported by users.
Interim commit for fixing GEN-2

GEN-2 is now split into 3 different DAL entities/ViewModels, one per
major type.