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

This commit breaks search on develop

This reverts commit feb515f13a8af04defc1f5023d0171f3e46fde42.