new feature for query completition