removing find_by_criteria and replacing with custom queryset queries and updating client side for the format change