Add keyword recheck logic