Fixed collisions filters on query functions
Added wildcard
arbiter updated method modified