changed category to separate entity fixing AGPUSH-999