added @NOTEMPTY to search fields