Custom post types added back to CNR-initiated queries

* Add: Custom query var to CNR queries
* Add: Check for custom query var before adding custom post types to query
* Optimize #1