Feature/fix emr server params