refactored the guts of the assignee and inventor city state zip queries