Added check if keyword is empty