Add fields for content search and refactor content filtering

Good point, it will scale much better than this solution too, especially if the search parameters are  very specific and we don't have to sift through every piece of content in the database.