prevent nil term searches in autocomplete from raising exceptions
Merge branch 'enhancements'