Properly deal with overlays vs base-layers [#2224089]