Eric updates 5/10
Merge pull request #30 from ktsweb1/master

Eric:Updates to filters, search