few more changes on the table shortcode