Disable data query causing problems on productive data