Feature/empty content 129