Mapping Ajax calls, bugfixes