Find events dialog/profile dialog bugfix
Conflict fix