Fixing empty and not_empty for working not just with strings