Now removes nil and empty strings