fixed some ajax
Merge branch 'john'