Add waits to ensure AJAX requests have finished [MJ-480]