add query with filters logic
tweaks