Query executor fixes
Fix sourcefiles validation