Updated Helper, refactoring behaviors
Added basics queries - Finder Behavior
typo
Merge branch 'dev'