Search field bugs are fixed.  Still need to refactor this section.