Added full support for filtering games