[[ Bug 13247 ]] Restrict searching to block range where appropriate