keyword issues fixed