v2 commit: fixing the ajax working correctly