changed to condition of removing query on dashboard.