Adding some required fields to lookups and constructing example query.