Search form performance

Improvements for #115. Need to test with full data set