fix preview, split tasks to services and products