Updated Forms to correctly use categories and tags