Adds missed optimiation in edit-server module