Apply the changes done in the database structure to the autocomplete views in order to make them work.

Also perform some minor style changes