I've updated the MR for cases when JavaScript is unsupported or disabled.