Update .idea xml file module order to alphabetical
Combine common EventUser query code