PIM-2011: Remove unwanted searchable elements