* Improved my last commit, only invalidate cur_folder_store and folder_to_select...