Fixes for ajax features