fixed keyword save behavior