Adding support for searching by description or name