Updates for preventing please wait message to be shown multiple times