Fixed some rules to prevent empty arrays/strings