Fix mind-boggling emptycontent logic