SP-158 fixed search results to use folder values