update credentials handling and populate keywords field