Used friendlyid and maintained other minor issues