Fix keywords controller