cleanup
don't rely on query vars for post ids