Fixes NPE for certain types of joins
Bugfix for CountRecord caching
Allows for multiple @CountField fields per modification