Fix post type and tax query filters; add tests for both