Fix render problem and include/exclude list bug