make better tagging, change some fields into required