improved ajax support