Revert "bug#16535: make it possible to combine search terms in term values"

This commit breaks search on develop

This reverts commit 7e0f959283fffedacb1b36d8e48245e38df8e727.