added option for query time keyword generation