added search fields and expressions