added missing validations and other changes

2 jobs for master in 11 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed pages-test #1705

00:00:10

 
  Deploy
passed pages-master #1706
production

00:00:01