HCSVLAB-457 Fix up collection model find methods (if they're really needed at all)