Bug fixes for the new instance data storage structure
Implementing new rules views