Don't check for empty extras & remove boolean whitelisted