Sergey/persons popup fixes