some bugfixes

8 jobs for !428 with 281-news-entry-portfolio-review-completed in 5 minutes and 16 seconds (queued for 1 second)
latest merge request