db circular reference fixes, link searching wip