Bugfixes for filtering..