If we have grade_span, we don't need gse_key in search
domain_id instead of domain for search
rm redundant symbols in search block
Normalizing order of search fields