Selecting single where appropriate

- Replaced selecting first collection item to selecting single
collection item, so that data errors would be visible earlier.