More work on getting multiple keywords working