Commits for 2020-08-21

The following 3 changes have been made on 2020-08-21:

- fixes (Author: Mirko De Grandis, Hash: #a41fc3d)
- trying to reduce database queries number (Author: Mirko De Grandis, Hash: #74f8027)
- fixes, code review, rewrite media block changes (Author: Mirko De Grandis, Hash: #2bb4ec7)

Check it out. More are coming soon!