Though advised differently, the patch starts with removing the ListView stuff, so I won't look any further at this version. Use the macro, it won't hurt.
Regards,Andreas