Clean validateDataWithRules
Revert "Clean validateDataWithRules"

This reverts commit e51e313c25d0caf19aa0ff23103cc68492327646.
Add check for empty queues