Made fix to mapping. Forcing to map by column instead of alias. For #37
Combined QueryOfQuery mapper into default Mapper class. For #37