listing and event controller improvements