Adding hack to make filter menu work again