Fixed 500 error on search
Merge branch 'develop'