Added fix for query reset on widgets, Added fix for category ordering in shortcode