Either split the file into two sections, one for single elements and one for multiple elements, or add an indicator, as you suggested before, so express that a selector is expected to return multiple elements.