Fix view for new api and schema