Hierarchical default with identifier fix

This pull request should fix #210 and #217 on stable branch