DATAES-14 - added option to choose different search types per query