Separating fixes from two different branches in quick_search