Bug Fix: Filter null and empty strings.