Fixed custom taxonomy queries for both widget at short code.