refactor: remove buggy query
Merge branch 'developer'