Feature/search field arg

@AaronHolbrook #reviewmerge