Added tag parsing to upload. Changed pattern for tags.