add check for entity selector list, change scenario