Smarter ward search