stop ajax from the next commit
Fixed templates way-to-go