[gs-*] correct keywords and masks