Added checks on client APi + fixed some autosuggest suggestion errors