empty keyword fix and !empty keyword added