friendlyID fixes