Fixed excessive querying when not needed for the ip address
Merge pull request #244 from mfalesni/event_fix

Fixed excessive querying when not needed for the ip address