Fixed meta_query for shortcodes, closes #6960