Fixing some client side issues with autocomplete