Added validation for entry and tags