Update LayerSearch based on feed back from Bart