Can now add fields in Unihan to search for. Will optimize this tomorrow.