Updated filter for variables + api call to save on server calls