Fix Keyword Targeting of Containers