query by link address improvement