Adapter filter optimisation

[huntc]

When filtering for a specific entity id, ensure that we do not marshal prior to the filtering. This has been achieved by factoring out some of the common code between produce_initial and produce.