fix: mepty where condition failed
Merge branch 'staging'