Fix rest api
Backup database and add filters
Merge branch 'rest-api'