Fix filters

Which was broken due to move of methods