ajax related fix lost in merging