usability + layer fetch bugfix