better filtering on Content-Type