I think you nailed it. Just need to play around with intent and see what works. Ultimately, users will also inform you of something needs tweaked.