Update codebase to fix the AJAX request issue