Cleanup parentheses and duplicate fix for second search struct.