Changes to ChooseQueryStyle and SelectPipelines

Added changes for code used in prototype 1