changing to apiname and including hierarchy in result