Search tags changes
Demo generation
Demo generation fixes. V 1.8.0