Improve detection of collection fields

Partially addresses #58