Reorganize how the keywords table works