fixed browser and operating system to return id insteado of name
fixed merge conflicts