CTRL-P filter improvement plus other random stuff