More Query3 Changes - Filter before adding to the tables