Fixes #3, change to !empty checks to avoid return of esc_attr