Tweaks to GF component; Hierarchical fixes #1100; Add pagination_location="both" to shortcode - Fixes #1101