Moving filter call down so it can return params in order