Updated TODO with bug
Fixed bug, simple variable name typo
Updates /services to use filter variables
Updates /hostgroups to use filter variables
Updates /servicegroups to use filter variables
Connected group data helper to data model
Changed formatting for consistency