One change that might help for filtering "photos" more precisely (including rejecting hints from some categories) would be to do away with the default of portrait/family photo when a new photo is added. My suggestion would be that there be no default category, but that the submitter be required to choose a category in order to proceed. Then, other users could choose which category would be acceptable as hints (e.g., only documents and headstones).
And while we're discussing photos: it was a big improvement when a newly added photo (a category that includes all types of images) no longer was a default portrait of the person to whose profile it was attached. However, attaching that same photo to five people at once (or to other people after it was attached to the first person) still results in that image becoming the primary portrait for all but the original person. So great great grandfather's will becomes the "portrait" of any descendant to whose profile it is attached and it is necessary to go to each profile and change that.