!Fixed : Empty Category issue