Add 'tag for pictures' functionality, and add test cases