Yeah, passing the post and page is not a good alternative. So the best way seems to leave it that way, at least for now.