Simplify Review schema handling

* RESOLVE Videos not showing in single view
* Simplify Review schema handling