Refactoring
Fix findLayer and add validateChanges