changes for linking to general finders