ajax fixes

Change-Id: Ia1929240d11eabcf4f14d07842ba1094544dbc4a