Entities with no description says "no description" in UI instead of None
Also changed the sorting to be done on the server side - this will avoid
issues when the name value for an item is set to None.