Fix feature attribute modifying
Fix popup