Improved where clause in invoice shortcodes