Fix drill down filter if context is missing
Merge