Null fix
Changed ES index and search analyzers