Added support to filter IPs by tenant_id

RM6299

Fixed some spacing issues