How could/should we handle this more elegantly? A WP_Query parameter? Something else?