Add constant for included fields
Add field selector to search form