Updated keywords - will add / migrate a new db structure as time permits. Not today though.