Fix orphaned shortcodes
Fix empty $where concerns
fix orphaned shortcodes a better way
increment version