Move source filtering into origin query