search: make non-indexed search perform about as well with nesting enabled as without

Created by: ijt

This is part of #1005 (closed).