Bug Fix: Searching Layers with Subtypes