Complex search bugfix

Merged Stefan Warnat requested to merge complex-search-bugfix into master
  1. Nov 30, 2020