Updates to get affilations working. Search for collections now works properly (and quickly).