[TASK] Avoid "count Parameter must be countable" in PHP 7.2

Avoid "count Parameter must be countable" in PHP 7.2 and unnecessary calls to count() by using !empty()