Fix empty tags + imageless sources