correct default query expire
done basic yandere
Merge branch 'yandere' into dev