Added filtering to views. Began complex query.