[HELIX-559] Fix Helix web admin performance issues, add missing a test