correct modal dialog
refactoring + adding server id