Intent-based user segmentation with query enhancement