Fixed merge errors
Completed database refactor
Fixed a JSON array issue in the QueryUserRequestObserver