Fixed some issues in filtered