Add tags field for keyword searching as well