Fixing web client after refactor