Fixes #1762 and #1756 (#1769)

* Fixes #1762 and #1756

* Reverted h2 to p for subtitles
3 jobs for develop in 8 minutes and 27 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #823687
docker
build

00:07:14

 
  Deploy
passed #823689
docker
deploy-aws-dev

00:01:10

passed #823688
docker
deploy-dev

00:00:58