[OE-3015] Fix preservative free common drug filter
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields