fixed references + removing duplicated id