Fix Where and cut config on update