bug fixes and cleanup of view names and autocomplete.