Refactoring of ContingentViewQueries
Updated other read models to match new pattern