Not filtering out custom parameters. And counting correctly