Simplify the code.
Merge branch 'ws-based' of github.com:materials-commons/mcfs into ws-based

Conflicts:
	mcfsd/interfaces/ws/filter/apikey_filter.go