Si: broken link fixes, streamlined queries etc