Tweaked shortcodes functions / Added tags to page template that checks for category in custom field -- need to test