fix regression in trash; fix regression in media blocks