Layers improvement plus initial work on search