moved filtering to plugin