Changed getSingular() to also accept the name of an entity
Added new case to ExpandedSelection
Minor optimization
Minor fix