Rework query technique + add more details
Fix touch events