API Filter bug fixes