fix for rendering previous search
merge
merge