FT-895: Performance issue with browser extension - Sasha B