Keywords singular/plural are considered as one
Keywords functions are adapted now