Add fields for content search and refactor content filtering

It would be better to harness ```ActiveRecord::Relation``` and use ```.where``` below so that only relevant content is loaded from the database (let the db do the filtering)