Clean up the main shortcode query a bit, formatting