Fix orWhere bug
Add json status code in view
Merge remote-tracking branch 'origin/master'