Adding support for URL and WP_query as mixed input