fixing up production settings
Merge branch 'search'