Fix cast None -> u'None'
Merge branch 'f/catalogue_poduct_infiniti_autocomplete'