Fix issue with adding keywords when service didn't have keywords