added tagging and search
old change
merge stuff