Fix small issues, (non detr.) add filter command.