Added choice of search