cleans up search partially, one test fails.
Punt on fillIn issue - not worth spending time on
Merge branch 'pr/704'
jshint