Add albums shortcode support and minor fix