Optimize content_blocks query
Merge pull request #669 from WouterSioen/patch-14

Optimize content_blocks query