Merge "Only store currently-existing categories in the categories table"