Improved noteLayer and dataLayer availability, closes #65