fixes #1167
fixes #1165
fixes #1158
Merge branch 'master' of github.com:r888888888/danbooru