LUN-1033: current_site needs to be passed to filer so that only
assets that belong to the current site can be used
Merge remote/LUN-1033 as part of major filer improvement