Fix for MID-2065 + some smaller issues with filtering on page with shadow details