Making some adjustments to the query vars to ensure they are returning clean.