Updated ids and checks for empty text