[RFR] Fix bagdes in frontend, PLAYGROUND-338