Fix for doctrine mapping
Filtering on cases plugged in as well as coverage on warnings