Update query count method, add query count test
Edit SMQuery methods to add values using mutable dictionary
Merge branch 'smquery_count' into development
Merge smquery fixes