Internal Server Error on Search refs #452
Merge remote-tracking branch 'origin/dev' into dev