Added more tags to demo