the UI guy
add exception for nil search terms
Merge branch 'master' into design