Fix for fetch plans and history