fix .gitignore to ignoring intellij project files.
fix with_tenant to ensure that current tenant be restored where block raise errors