Feature/635 add typeahead fixes

Fix for #635, and couple other minor improvements.