Build data_sources dropdown from a dict
Pagination should not skip to second page

(this is the bug that caused low-numbered search results to now show)
Retain previous search parameters in form
Show highlighted search terms... still needs work