Added target position span query and tests