Fixes to limit, template shortcode params (thanks to williamlevins for highlighting the issue)