Switching over to multiple query loader