LB-1396 Make it work in the frontend